loginDialog: Use the same prompt layout as the unlock dialog

Currently the layout of the password prompt differs slightly between
login dialog and unlock screen - for the former, the prompt is
displayed next to the user avatar, replacing the user name, for
the latter, it is diplayed below both avatar and name.

https://bugzilla.gnome.org/show_bug.cgi?id=685201

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 6cbf39fe91d4767143bc2fbff04637cc2a1cd596..77844a58685f2a637637250422dfe72e178de784 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -2033,7 +2033,6 @@ StScrollBar StButton#vhandle:active {
 }
 
 .login-dialog-user-list-item {
-    color: #666666;
     border-radius: 10px;
     padding: .2em;
 }
@@ -2051,6 +2050,11 @@ StScrollBar StButton#vhandle:active {
     padding-left: 1em;
 }
 
+.login-dialog-user-list:expanded .login-dialog-user-list-item {
+    color: #666666;
+}
+
+.login-dialog-user-list-item,
 .login-dialog-user-list-item:hover .login-dialog-user-list-item-name,
 .login-dialog-user-list:expanded .login-dialog-user-list-item:focus .login-dialog-user-list-item-name,
 .login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in {

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 3575ca2742f96c81e68f5f8d8b0aba89cbfd98d3..350e2c7cfc3e250d023bcd4a694d3becc41cb32f 100644 (file)
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -220,10 +220,6 @@ const UserList = new Lang.Class({
     _showItem: function(item) {
         let tasks = [function() {
                          return GdmUtil.fadeInActor(item.actor);
-                     },
-
-                     function() {
-                         return item.fadeInName();
                      }];
 
         let batch = new Batch.ConsecutiveBatch(this, tasks);
@@ -686,31 +682,23 @@ const LoginDialog = new Lang.Class({
                               { y_fill: false,
                                 y_align: St.Align.START });
 
-        let mainContentBox = new St.BoxLayout({ vertical: false });
-        this.contentLayout.add(mainContentBox,
+        this._userList = new UserList();
+        this.contentLayout.add(this._userList.actor,
                                { expand: true,
                                  x_fill: true,
-                                 y_fill: false });
-
-        this._userList = new UserList();
-        mainContentBox.add(this._userList.actor,
-                           { expand: true,
-                             x_fill: true,
-                             y_fill: true });
+                                 y_fill: true });
 
         this.setInitialKeyFocus(this._userList.actor);
 
         this._promptBox = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
                                              vertical: true });
-        mainContentBox.add(this._promptBox,
-                           { expand: true,
-                             x_fill: true,
-                             y_fill: true,
-                             x_align: St.Align.START });
+        this.contentLayout.add(this._promptBox,
+                               { expand: true,
+                                 x_fill: true,
+                                 y_fill: true,
+                                 x_align: St.Align.START });
         this._promptLabel = new St.Label({ style_class: 'login-dialog-prompt-label' });
 
-        this._mainContentBox = mainContentBox;
-
         this._promptBox.add(this._promptLabel,
                             { expand: true,
                               x_fill: true,
@@ -1170,10 +1158,6 @@ const LoginDialog = new Lang.Class({
                          return this._userList.giveUpWhitespace();
                      },
 
-                     function() {
-                         return activatedItem.fadeOutName();
-                     },
-
                      new Batch.ConcurrentBatch(this, [this._fadeOutTitleLabel,
                                                       this._fadeOutNotListedButton,
                                                       this._fadeOutLogo]),
@@ -1229,7 +1213,7 @@ const LoginDialog = new Lang.Class({
     },
 
     _onOpened: function() {
-        Main.ctrlAltTabManager.addGroup(this._mainContentBox,
+        Main.ctrlAltTabManager.addGroup(this.contentLayout,
                                         _("Login Window"),
                                         'dialog-password',
                                         { sortGroup: CtrlAltTab.SortGroup.MIDDLE });